From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Sun, 20 Mar 2016 13:07:47 +0000 (+0100)
Subject: Allow the shr test files to have trailing blank space.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~3349
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=565df7265dd73b4812fcb02cd1663fce4dc40be7;p=emacs.git

Allow the shr test files to have trailing blank space.

* .gitattributes: Allow the shr test files to have trailing
blank space.
---

diff --git a/.gitattributes b/.gitattributes
index 13e58a87e9f..24fe4c7acfa 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -33,6 +33,9 @@ test/etags/html-src/algrthms.html whitespace=cr-at-eol
 # The upstream maintainer does not want to remove trailing whitespace.
 doc/misc/texinfo.tex -whitespace=blank-at-eol
 
+# The shr test files can have trailing whitespace.
+test/data/shr/*.txt -whitespace=blank-at-eol
+
 # Some files should not be treated as text when diffing or merging.
 *.cur binary
 *.gpg binary